Fix frame_right/frame_top screwup. (Detlef Reichl, #78111)

Tue May 14 18:02:37 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_realize): Fix
        frame_right/frame_top screwup. (Detlef Reichl,
        #78111)

        * gtk/Makefile.am (install-data-local): Use
        $(INSTALL_DATA) not $(INSTALL) when installing
        theme files. (#77094, Ben Liblit)

diff --git a/ChangeLog b/ChangeLog
index 5e0b387c3abd6217a7b2af73d29e53c981a42d3b..e55313aaa215effcf535562995bacc33a10b2fb6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue May 14 18:02:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_realize): Fix
+       frame_right/frame_top screwup. (Detlef Reichl,
+       #78111)
+
+       * gtk/Makefile.am (install-data-local): Use
+       $(INSTALL_DATA) not $(INSTALL) when installing
+       theme files. (#77094, Ben Liblit)
+
 Tue May 14 17:30:57 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c gtk/gtkclist.c: Fix format of 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5e0b387c3abd6217a7b2af73d29e53c981a42d3b..e55313aaa215effcf535562995bacc33a10b2fb6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Tue May 14 18:02:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_realize): Fix
+       frame_right/frame_top screwup. (Detlef Reichl,
+       #78111)
+
+       * gtk/Makefile.am (install-data-local): Use
+       $(INSTALL_DATA) not $(INSTALL) when installing
+       theme files. (#77094, Ben Liblit)
+
 Tue May 14 17:30:57 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c gtk/gtkclist.c: Fix format of 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5e0b387c3abd6217a7b2af73d29e53c981a42d3b..e55313aaa215effcf535562995bacc33a10b2fb6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Tue May 14 18:02:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_realize): Fix
+       frame_right/frame_top screwup. (Detlef Reichl,
+       #78111)
+
+       * gtk/Makefile.am (install-data-local): Use
+       $(INSTALL_DATA) not $(INSTALL) when installing
+       theme files. (#77094, Ben Liblit)
+
 Tue May 14 17:30:57 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c gtk/gtkclist.c: Fix format of 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5e0b387c3abd6217a7b2af73d29e53c981a42d3b..e55313aaa215effcf535562995bacc33a10b2fb6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Tue May 14 18:02:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_realize): Fix
+       frame_right/frame_top screwup. (Detlef Reichl,
+       #78111)
+
+       * gtk/Makefile.am (install-data-local): Use
+       $(INSTALL_DATA) not $(INSTALL) when installing
+       theme files. (#77094, Ben Liblit)
+
 Tue May 14 17:30:57 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c gtk/gtkclist.c: Fix format of 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5e0b387c3abd6217a7b2af73d29e53c981a42d3b..e55313aaa215effcf535562995bacc33a10b2fb6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Tue May 14 18:02:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_realize): Fix
+       frame_right/frame_top screwup. (Detlef Reichl,
+       #78111)
+
+       * gtk/Makefile.am (install-data-local): Use
+       $(INSTALL_DATA) not $(INSTALL) when installing
+       theme files. (#77094, Ben Liblit)
+
 Tue May 14 17:30:57 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c gtk/gtkclist.c: Fix format of 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5e0b387c3abd6217a7b2af73d29e53c981a42d3b..e55313aaa215effcf535562995bacc33a10b2fb6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Tue May 14 18:02:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_realize): Fix
+       frame_right/frame_top screwup. (Detlef Reichl,
+       #78111)
+
+       * gtk/Makefile.am (install-data-local): Use
+       $(INSTALL_DATA) not $(INSTALL) when installing
+       theme files. (#77094, Ben Liblit)
+
 Tue May 14 17:30:57 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkctree.c gtk/gtkclist.c: Fix format of 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index da26d76b6763505942f4134e3b2de64ba67c4395..10a0800891122ab468d3d3a96a09545665ed932f 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -565,11 +565,11 @@ endif
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-libtool-import-lib
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
-       $(INSTALL) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
+       $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
-       $(INSTALL) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
+       $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
-       $(INSTALL) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
+       $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
        rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 779be00b443ecfb3ff0aa17865538b1797b635cf..c996d4ab5e357570836aae40d92f94352f8d62bb 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3307,7 +3307,7 @@ gtk_window_realize (GtkWidget *widget)
       
       attributes.window_type = GDK_WINDOW_CHILD;
       attributes.x = window->frame_left;
-      attributes.y = window->frame_right;
+      attributes.y = window->frame_top;
     
       attributes_mask = GDK_WA_X | GDK_WA_Y;